Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Port main changes to next #2532

Merged
merged 316 commits into from
Nov 14, 2023
Merged

Port main changes to next #2532

merged 316 commits into from
Nov 14, 2023

Conversation

rudyflores
Copy link
Contributor

@rudyflores rudyflores commented Oct 27, 2023 •
edited
Loading

Proposed changes

Bring changes from 2.11.1 to 2.12.0 from main branch of Zowe Explorer into next branch for our upcoming pre-release 2 of 3.0

Release Notes

Milestone: v3.0 pre-release 2

Changelog: bring changes from main into next (v2.11.1 -> 2.12.0)

Types of changes

What types of changes does your code introduce to Zowe Explorer?
Put an x in the boxes that apply

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Updates to Documentation or Tests (if none of the other choices apply)

Checklist

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This checklist will be used as reference for both the contributor and the reviewer

  • I have read the CONTRIBUTOR GUIDANCE wiki
  • PR title follows Conventional Commits Guidelines
  • PR Description is included
  • gif or screenshot is included if visual changes are made
  • yarn workspace vscode-extension-for-zowe vscode:prepublish has been executed
  • All checks have passed (DCO, Jenkins and Code Coverage)
  • I have added unit test and it is passing
  • I have added integration test and it is passing
  • There is coverage for the code that I have added
  • I have tested it manually and there are no regressions found
  • I have added necessary documentation (if appropriate)
  • Any PR dependencies have been merged and published (if appropriate)

Further comments

JillieBeanSim and others added 30 commits September 26, 2023 07:59
@JillieBeanSim
address feedback
b9cd91c 
Signed-off-by: Billie Simmons <[email protected]>
@JillieBeanSim
fix unit tests
2c5eba7 
Signed-off-by: Billie Simmons <[email protected]>
@rudyflores
Merge pull request #2470 from zowe/change-file-tags-ui
fd0649f 
Add option to change tag of uss file
@traeok
fix(job,uss): Remove extra 'delete job' msg; Add check for paste API …
83ec896 
…& fix paste refresh

Signed-off-by: Trae Yelovich <[email protected]>
@traeok
chore: update CHANGELOG
8ae3565 
Signed-off-by: Trae Yelovich <[email protected]>
@traeok
test(uss): Add test case for pasteUss - unsupported APIs
0ab2c07 
Signed-off-by: Trae Yelovich <[email protected]>
@traeok
fix(uss): update USS directory icons when collapsed
b35edb5 
Signed-off-by: Trae Yelovich <[email protected]>
@traeok
fix(tests): Add missing 'onDidCollapseElement' function to mocks
4a581db 
Signed-off-by: Trae Yelovich <[email protected]>
@traeok
fix(trees): Update icon when folder/session is collapsed
d7cfb60 
Signed-off-by: Trae Yelovich <[email protected]>
@JillieBeanSim
address feedback
6006d3c 
Signed-off-by: Billie Simmons <[email protected]>
@JillieBeanSim
Merge remote-tracking branch 'origin/main' into profile-management
3990e7a 
Signed-off-by: Billie Simmons <[email protected]>
@JillieBeanSim
update log string
5b57f4c 
Signed-off-by: Billie Simmons <[email protected]>
@JillieBeanSim
address code smell
c5dd06c 
Signed-off-by: Billie Simmons <[email protected]>
@traeok
fix: add JCLLIB to appendSuffix checks
ef8a96f 
Signed-off-by: Trae Yelovich <[email protected]>
@dependabot
chore(deps): Bump get-func-name from 2.0.0 to 2.0.2
c9c7ca3 
Bumps [get-func-name](https://github.com/chaijs/get-func-name) from 2.0.0 to 2.0.2.
- [Release notes](https://github.com/chaijs/get-func-name/releases)
- [Commits](https://github.com/chaijs/get-func-name/commits/v2.0.2)

---
updated-dependencies:
- dependency-name: get-func-name
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
@JillieBeanSim
Merge branch 'main' into ZE-Extenders-MetaData
d6e6534
@zFernand0
Merge pull request #2474 from zowe/fix/ds/sort
094f904 
fix(ds): Sort dataset list by label after adding new children
@zFernand0
Merge branch 'maintenance' into fix/uss/tree-ux
d0586b7 
Signed-off-by: Fernando Rijo Cedeno <[email protected]>
@zFernand0
Merge pull request #2482 from zowe/dependabot/npm_and_yarn/get-func-n…
553ceaa 
…ame-2.0.2

chore(deps): Bump get-func-name from 2.0.0 to 2.0.2
@likhithanimma1
Handled Duplicates and made changes to CHANGELOG files
ef5d5a2 
Signed-off-by: Likhitha Nimma <[email protected]>
@zFernand0
Merge branch 'main' into ZE-Extenders-MetaData
bb2e749
@JillieBeanSim
Merge branch 'main' into profile-management
af7e90c
@rudyflores
refactor of webview code
fdd069c 
Signed-off-by: Rudy Flores <[email protected]>
@traeok
test(trees): Add test for refreshIconOnCollapse generated listeners
acf134e 
Signed-off-by: Trae Yelovich <[email protected]>
@rudyflores
add back tag code lost from merge
0881ac1 
Signed-off-by: Rudy Flores <[email protected]>
@rudyflores
fix lint check
e5990bb 
Signed-off-by: Rudy Flores <[email protected]>
@rudyflores
add new dist location to prettierignore
3bc88aa 
Signed-off-by: Rudy Flores <[email protected]>
@rudyflores
revert lint to original no lint message
45585bc 
Signed-off-by: Rudy Flores <[email protected]>
@likhithanimma1
addToConfigArray functionality changed
5afd103 
Signed-off-by: Likhitha Nimma <[email protected]>
@traeok
fix(ds,jobs): Only assign IDs to session nodes in tree
dbac736 
Signed-off-by: Trae Yelovich <[email protected]>
t1m0thyj
t1m0thyj reviewed Nov 1, 2023
View reviewed changes
Copy link
Member

@t1m0thyj t1m0thyj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Noticed the circular dependency check is fixing, should we try to fix it?
image

@rudyflores
Copy link
Contributor Author

Heads up @JillieBeanSim @zFernand0 @t1m0thyj have a couple comments on failing checks here:

  1. I discussed with @traeok about that failing check on circular dependencies and we'll have to address this in a separate PR, feel free to add more comments on this Trae!
  2. Theia check fails due to build:integration script still calling v1 profile functions, these were removed for v3 preparations to remove support for v1 profiles
  3. Failing SonarCloud check is due to already exisiting duplications from tests being ported

@t1m0thyj See comment from here :) I go more in detail on this

@JillieBeanSim
Copy link
Contributor

@rudyflores theia and checks failing due to existing duplication isn't an issue but we are fixing the circular dependencies as they arise. Please address in this PR.

@rudyflores
Copy link
Contributor Author

@rudyflores theia and checks failing due to existing duplication isn't an issue but we are fixing the circular dependencies as they arise. Please address in this PR.

@JillieBeanSim this is also present on main branch, the reason we never caught this issue is because the madge command is no longer part of the build command there

zFernand0 and others added 5 commits November 2, 2023 11:09
@zFernand0
Merge pull request #2531 from zowe/2.12.0-release
69e21b0 
Prepare v2.12.0 release
@zowe-robot
Bump version to 2.12.0 [ci skip]
89fc813 
Signed-off-by: zowe-robot <[email protected]>
@zowe-robot
Bump version to 2.13.0-SNAPSHOT [ci skip]
7d9bf7c 
Signed-off-by: zowe-robot <[email protected]>
@dependabot
chore(deps): Bump browserify-sign from 4.2.1 to 4.2.2
c92eba0 
Bumps [browserify-sign](https://github.com/crypto-browserify/browserify-sign) from 4.2.1 to 4.2.2.
- [Changelog](https://github.com/browserify/browserify-sign/blob/main/CHANGELOG.md)
- [Commits](browserify/browserify-sign@v4.2.1...v4.2.2)

---
updated-dependencies:
- dependency-name: browserify-sign
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
@rudyflores
fix circular dependency
f336ffe 
Signed-off-by: Rudy Flores <[email protected]>
@rudyflores
Copy link
Contributor Author

@JillieBeanSim all good to go! no more circular dependencies :)

JillieBeanSim and others added 6 commits November 2, 2023 16:11
@JillieBeanSim
Merge pull request #2530 from zowe/dependabot/npm_and_yarn/browserify…
f4f56ff 
…-sign-4.2.2

chore(deps): Bump browserify-sign from 4.2.1 to 4.2.2
@JillieBeanSim
Merge branch 'main' into fix/ftp/temp-files
e29cd23
@JillieBeanSim
Merge pull request #2526 from zowe/fix/ftp/temp-files
c2fc8c9 
fix(FTP): One active FTP connection per operation; remove temp. files once finished
@rudyflores
Bring in 2.12.0 changes into next
8fe52c5 
Signed-off-by: Rudy Flores <[email protected]>
@rudyflores
Merge branch 'next' into port-main-to-next
6852a1d 
Signed-off-by: Rudy Flores <[email protected]>
@rudyflores
fix merge conflict
e390537 
Signed-off-by: Rudy Flores <[email protected]>
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Nov 7, 2023

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
5.9% 5.9% Duplication

idea Catch issues before they fail your Quality Gate with our IDE extension sonarlint SonarLint

JillieBeanSim
JillieBeanSim approved these changes Nov 14, 2023
View reviewed changes
Copy link
Contributor

@JillieBeanSim JillieBeanSim left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! thanks @rudyflores for bringing in these updates

@rudyflores rudyflores merged commit 9ad5a7f into next Nov 14, 2023
21 of 23 checks passed
@rudyflores rudyflores deleted the port-main-to-next branch November 14, 2023 20:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@t1m0thyj t1m0thyj t1m0thyj approved these changes

@JillieBeanSim JillieBeanSim JillieBeanSim approved these changes

@traeok traeok Awaiting requested review from traeok

@zFernand0 zFernand0 Awaiting requested review from zFernand0

Assignees

@rudyflores rudyflores

Labels
no-changelog Add to PR's that don't require a CHANGELOG update
Projects
Zowe Explorer for VS Code
Status: Closed
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@rudyflores @zFernand0 @traeok @JillieBeanSim @t1m0thyj @likhithanimma1 @zowe-robot